From f92c861eec59c23ad16c0579b3be8242ab0ef2d7 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 11 Sep 2015 18:33:05 +0200 Subject: [PATCH] iconcache: Guard deprecated gdk-pixbuf APIs --- gtk/gtkiconcachevalidator.c | 2 ++ gtk/updateiconcache.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/gtk/gtkiconcachevalidator.c b/gtk/gtkiconcachevalidator.c index 9afc0c61cf..907e19afc3 100644 --- a/gtk/gtkiconcachevalidator.c +++ b/gtk/gtkiconcachevalidator.c @@ -163,9 +163,11 @@ check_pixel_data (CacheInfo *info, { GdkPixdata data; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; check ("pixel data", gdk_pixdata_deserialize (&data, length, (const guint8*)info->cache + offset + 8, NULL)); +G_GNUC_END_IGNORE_DEPRECATIONS; } return TRUE; diff --git a/gtk/updateiconcache.c b/gtk/updateiconcache.c index 47375d10dd..4a11966676 100644 --- a/gtk/updateiconcache.c +++ b/gtk/updateiconcache.c @@ -514,7 +514,9 @@ maybe_cache_image_data (Image *image, if (pixbuf) { +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; gdk_pixdata_from_pixbuf (&idata->pixdata, pixbuf, FALSE); +G_GNUC_END_IGNORE_DEPRECATIONS; idata->size = idata->pixdata.length + 8; idata->has_pixdata = TRUE; } @@ -825,7 +827,9 @@ write_image_data (FILE *cache, ImageData *image_data, int offset) if (!write_card32 (cache, 0)) return FALSE; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS; s = gdk_pixdata_serialize (pixdata, &len); +G_GNUC_END_IGNORE_DEPRECATIONS; if (!write_card32 (cache, len)) { -- 2.30.2